Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Tue, 22 Jun 2010 13:27:02 +0000 (13:27 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Tue, 22 Jun 2010 13:27:02 +0000 (13:27 +0000)

Trivial merge